issue #1413 It can not be automatically merged, also I fix it in some other places
Merge pull request #1445 from conejoninja/f1413

issue #1413 It can not be automatically merged, also I fix it in some ot...