Canonical interview question

Do a backport of a specific commit.