Fixed issue #1898
Issue #1711 was fixed.
Java 6 compilation issue was fixed.
Merge branch 'hotfix-1.6.3' into develop