Adding missing files from fix for PHOENIX-1284