Issue #2640 was fixed.
Merge branch '1.7.8' into mastercluster