4.1 upgrades from 2013.07 branch