Apart from that this PR looks fine.