Merge "Various fixes for ChangesList"