Created by: wojtask9
I'm not sure if this aproach is correct. If not please discard this PR.
Fixes #18406 (closed).