Dev - Merge Release 2c

More details in the Release Notes

http://1-06-019.rva-test.appspot.com/