Merge branch 'net-atlantic-various-features'