Board Thread:Suggestions/@comment-27546869-20181013022624/@comment-34718813-20181013093746

PR needs fix this