AH-384 Missed these files in merge