WC-440 #comment Merge notepadCtrl