Merge branch 'release/2.1' into develop
Merge branch 'hotfix/Fix_double_hex_encoding' into develop
Added Child test
Merge branch 'release/2.1'