Feature/njb toward 2.2.0