Merge updates and bugfix