Merge "Update NSH patches"