Merge pull request #88 from lhein/7.2.x

fixes for ECLIPSE-1073 and ECLIPSE-1074