Fix merge of release back to dev