Merge "(Control) Re-added Background enums" into devel/master