am a9059498: am b61394a0: am 24421e07: am 14ddbda6: am a38a15dd: Merge "tiny refactor"

* commit 'a9059498c91e9768d1b290cf3133d8cb58969eb6':