Changes in bugfix branch