Create final release 0.396 for build 150
Merge remote-tracking branch 'origin/develop' into develop