Integrated PR #74