remove z-index specification: not needed?
Merge commit 'github/testing' into beta