bug-2227-alt
Merge branch 'bug-2227-alt' into dev