KFSTP-1403
merged from release-5-3-1
Merge pull request #33 from kkronenb/master

Merge from 5.3 branches as well as the last CGB commit in svn