Merge branch 'refs/heads/3_gson' into develop