HH-40944 initial commit