OHFT-17 prepare for release