Can you do these two TODOs before merging?