Issue #3461316 by amanbtr72, dcam, pasqualle, smustgrave, acbramley: Redirect block/add if there is only one block type (cherry picked from commit ed28d46c)
