Merge pull request #1719 from shackbarth/23962-css2