Updating branch with latest fixes in master