VIVO-272 Do proper merge and tag of the final release