Merge Quickhac common into this lib