Merge pull request #90 from lhein/7.2.x

fixed ECLIPSE-1076
fixed issue ECLIPSE-1082