Migrated 5 commits from dev branch

commit f1a1e11d460f4b0bf92339d0747f6e8fad63368c
commit 9484c92ef25152c12cac4d0bcdeea80477074bca
commit b032bd919d8b1d8d8b340b4c83c576571e88a7f8
commit 4c2e9d4a4d93017282f094c501211ffa21e93f8e
commit b2046ad0f86c8085971839079d7c945569cab112
Merge branch 'testing' into develop