This issue is known and is being fixed in #831 . Raised this issue to avoid merge conflicts if someone opens another PR/issue for this.