NAWQAAN-363

Still on 334 branch, but this really relates to 363.