DF-5198 fix HandleBase.h