LPS-46098 Apply LPS-46034 to plugins