Apply 2.1.5 chagnes