[Fork] Custom changes for merlin, vaxe and conflicting plugins

Summary:

Test Plan:

Reviewers:

CC: