Add changes for merged PR #2