fix for issue #1695
resolves issue #1693
Closes Issue #1694
Merge branch 'rc3' into s3