Merge "VPP: Remove EOM branches"