Merge branch 'release/7.x-0.36.3' into develop
updated tag versions in make file
udated to version 7.x-0.37
Merge branch 'release/7.x-0.37'