Merge "Various fixes for EnhancedChangesList"