NXP-15796: align on 5.9.6-SNAPSHOT