Merge the latest developments to the master branch