MIFOSX-885 Charge mandatory feature is added