Integrated changes for 9-5-2014