Resync of branch with the latest working changes