Latest merge and update of code