Partial PR: https://github.com/hyvor/blogs/pull/512
Partial PR: https://github.com/hyvor/blogs/pull/512