Components and flags merge into master
Merged