Committing after Parwinder's changes to patch script.