HH-31508 cleanup
version up to 2.15.5