Merge branches 'configuration' and 'updates'