NXP-14579: align on 5.9.5-SNAP