WC-267 #comment fixed settings