Merge "Add new clipboard" into devel/master