Use common part once a bit later. (cherry picked from commit 2a70eae04f) (cherry picked from commit d04af52222)
2a70eae04f
d04af52222