Merge "Make sure folder positioning is behind flag" into main