neglected commit of maven version set
Merge branch 'master' into dev/merops-tables