fixes before rollout on 2.2.eap5