NXP-12603: align on 5.8.0-HF02-SNAPSHOT
NXP-12603: align on 5.9.1-SNAPSHOT