Merged back 1.4 testing code