Merged back 1.4 testing code
Merge branch 'master' into 1.4