Bz1097788 eaphome 6.3.x