NXP-15796: align on 6.0-SNAPSHOT for NXP-15782