Merge "Remove unnecessray ClipBoard creation (2)" into devel/master