This has been fixed and merged. No idea why JIRA didn't update the status of this issue to resolved, therefore, I am doing it.
