Fixes #967 Requires new styles implemented in #1166 (cherry picked from commit 0457f7bee8)
0457f7bee8