Fix schema only generation and BR. Add make consolidation schema only [#389]