Added:
Note that !470 (closed) and !469 (merged) must be merged first since I branched from there.
After that, I can do a rebase if desired.