accommodate core menu block margins on Test
Merge branch 'refs/heads/master' into test