Merge branch 'dev' into 1.1.3.10-beta
V1.1.3.10

Included bundled Flat UI and Samples