Merge branch 'atlantic-bugfixes'