update genlock from jb_2.5 caf branch