Merge "Add ENABLE_SHIFT_SELECTION property" into devel/master