Merge "Automatic Control Clipping" into devel/master