This is the same as !1119 (closed), but simplier.
added 1 commit
Compare with previous version
merged
mentioned in commit cce55ccf