Created by: mikeattara
This solves issue #5805 (closed) @iansu and @Timer Kindly review my suggested solution Thanks