WC-537 #comment -