Merge with last branch version on quattor