merge vali-xfm approval (Flymaster)