Issue #2284917 by Wim Leers, larowlan, olli: In-place editing of custom blocks broken *again* (because attributes and contextual links of custom blocks are lost)
Issue #2396793 by xjm: Token API will match tokens with empty types or tokens, e.g. [:invalid]