Context: lego#27 (closed)
Closes: #291 (closed)
TPA RFC 29 was implemented to make the fix easier to commit.