Post hh5 merge: syncing branchs