Apply 2.1.3 changes