WC-441 #comment Merge from test 2 main