Merge branch 'promayoe-master-patch-44539' into 'master'

NEW add doc to solve conflict with develop

See merge request !4
2 jobs for master in 38 seconds (queued for 3 seconds)