merge release 5