Merge branch 'angle-adjust' into merged_loops