Merge "Fix folder clipping bug" into main