ticket #2222 fixes
Merge branch 'master' into T-2222
ticket #4223 fixes
ticket #4223 fixes
ticket #4222 fixes
Merge branch 'master' into T-4223
Merge pull request #8 from Backendless/T-4223

T 4223