included changes @tianon proposed in #17362 Signed-off-by: Elvir Kuric <elvirkuric@gmail.com> Upstream-commit: 5c329633d7ce7adfa390e70b91c3e87c5d05ef93 Component: engine
included changes @tianon proposed in #17362 Signed-off-by: Elvir Kuric <elvirkuric@gmail.com> Upstream-commit: 5c329633d7ce7adfa390e70b91c3e87c5d05ef93 Component: engine