Design - saturday corrections
Merge commit 'fc8e22d7a7d9407c9315a2c654f1b775dd221bc0' into stage