Fixed auto merge error
Merge remote-tracking branch 'origin/feature/MIdocspass' into develop