refactorization. Import community modules from 2.2.x