blocking 62913 (1.4) from trunk, as it's already done here