Corrected strong reference bug
Merge branch 'release/CJ1.0' into develop