Refers to @omajid comment in PR #473
rebased onto a2aafc984f020e01d944d88e4548d0b34a24b4f6
Thanks! Merged.
Pull-Request has been merged by pbokoc
Refers to @omajid comment in PR #473