Resolve WC-1466, WC-1446, WC-1437