Actualize
Merge remote-tracking branch 'origin/develop' into AndroidTest
Manual merge with Demo2