HH-41098 fix review comments, squash later [maizy]