Post-2.2 update

Update submodule commits and fix namespace clobbering of samples.