#mg-109 state: fixed work: 40m Delivery model in AA.
Merge remote-tracking branch 'origin/develop' into develop