DO NOT Merge rc/2014 05 14 into release YET