Taking up the TODO part introduced by the @Project Update Bot.