Fixed CHUN-13
Merge branch 'test' into dev