[[ MERGE-6.7 ]] Changed initials for the merge to SN
[[ MERGE-6.7 ]] Fix the clipping error introduced during the merge (and few other things)