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