Feature refresh hooks merge to 2.4 from 2.0