Removed changes from master for easy cherry picking