Update todo backports from master branch