Version 1.2.3 update

And git merge errors fixed