Progress on PR341