Merge to master
Changed test 1.1
Merge resolved v1.1
Deleted Flag files