CSIT-1040: Static content improvements