CON-1016

*DO NOT MERGE*
Did you consider using before/after preudoelements?