LPS-40147 Update markup to look for
LPS-40146 Update markup to look for
LPS-40384 Apply to plugins