Merge pull request #1860 from wpaulino/open-channel-anchors-support