nope it has not been merged. it should have been a separate commit but birkan branched this PR off my PR and included my commits in this PR. I made my changes in this PR and closed my original PR.