Release 1 fix
Resolved merge conflict
Notes for release 2