[Commits] 0a669d663cf: Post-rebase fixes