Re-merges back in pull request changes to ensure that the js and css bundles are rendered together without multiple script tags.