Merge pull request #93 from lhein/7.2.x

fixed issue ECLIPSE-1082