Roll to 2014.08.3p4 for key pair fix