Fixed building Release solution on Debug builds
Merge branch 'master' into dev
Merge branch 'dev' into tf-iscommited