Merge with another branch

Many updates and fixes (See change log)