fine tune Bug ZK-1234
release 6.5.3
update version to 6.5.4
Merge branch 'master' into 7.0