Merge pull request #2836 from kumpera/cwt_toggleref