13 Aug 2018 I am attaching a patch to resolve this issue. Please review. gauravgarg Code contributions