Synchronize last patches and bugfix from development branch