Merge "Fix one liner" into main