Original MR: !5 (merged)
This MR is a port due new changes from !4 (merged)
Newest first
Oldest first