updated version
Merge branch 'master' into releases
norm v2.3.6 build