Merge "Use tempest plugin interface"