FLEX-33893 CSS memory / performance fix