Merge pull request #1044 from jay-hodgson/release-48

merge swc-1486 (use display style directly instead of setting via css) from develop