#mg-79 state: fixed work: 15m progress in bottom.
Merge remote-tracking branch 'origin/develop' into develop