Resolving the issue as this was merged long time ago and it's part of the last release