[OES-171] fixed cc address double-encoding
Merge branch 'master' into develop