Merge pull request #477 from heidiso/develop

SWC-736 Supertable cleanup work
SWC-735 Reference widget enhancements
Merge branch 'swc735_ref_improv' into develop