Retrofit of 14671, 14427, and part of 12172