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