Cat 1082 hidebug

please check licence header