Apply 2.1.4 changes