[DO NOT MERGE] Static related content

@jongilbraith