Upgrade to NH 4.0#17

afsharm wants to merge 2 commits into

codai:mastercodai/Sharp-Lite:masterfrom

Paysa:masterPaysa/Sharp-Lite:masterCopy head branch name to clipboard