Fixed margin issue
Merge commit 'grassy-knoll.r04' into integration