Keep alive from 1.4 branch