#955868: #921206: Porting over the new style by zoo33 / Sthlmconnection.se and the inline feature from 6-dev.