merge F2014 updates