Reviewing merge request "clone-by-ertai" → "mainline"

[merged]

clone-by-ertai:factorize-html has requested a merge with mainline:edge:

Factor this part of the code will simplify a forthcoming task.