Similar to !306 (merged)
added 1 commit
Compare with previous version
mentioned in commit 76e9afce
merged