Changes from PR #1 need to be integrated into the 2.0 branch
Changes from PR #1 need to be integrated into the 2.0 branch