Various ports including 8dfe5179ee7186e549dbe1186a151ffa848fe8ab,
d1de7fb7fa561a76c30f3b1f60b82856443ed4b3 and
9f8d34620b6fa502da683f3775805bf2a5474f92.
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>