Syncrhonizing this new file to release 4.2