Merge "fix(ff-a): ivy shim receives NPI feature"