Merge commit '9ac5e4aea125e706201c61b0ccb13a2cafe5618f' into clipping