Filter for adding additional control blocks to Frontier Templates #2304 Copy of 39daf93 in 2.x