Merge final release for build 2685 to develop