Merge "Update plugins in Lifecycle Mapping for CLAMP"