Merge pull request #12888 from jmzwcn/patch-3

`docker images` friendly duration gets unfriendly after a while