LPS-35431 Roll back some SF from LPS-34846, web content now scoped correctly
LPS-35431 Source formatting
LPS-35431 SF