Adding final release for build 2311
Merge final release for build 2311 to develop