Cherry-pick #11308 to 2014.1

This should only be merged if #11308 is merged.