LB-1918 Matched plugin with design