Merge "Action-Identifier to support vf-module-id"