Merge "Fix for grab/selection handle." into devel/master