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