refactorign
refactoring
cleanup
refactoring
fixes after refactoring
sync
improve configuration checking
more config checks
cleanups after config refactoring
components checking
improve checking
Merge remote-tracking branch 'upstream/master'