merging bbb changes but fractional clock