Extract valuable changes of closed merge request !428

Summary

(Summarize the bug encountered concisely.)

Explain your context

(Explain what you did.)

What is the expected correct behavior? What was your goal?

(What you should see instead.)

What is the current bug behavior?

(What actually happens.)

Was there an error message?

(Paste any relevant logs - please use

code blocks like this one

or

this one

to format console output, logs, and code, as it's very hard to read otherwise.)

Steps to reproduce

(How one can reproduce the issue - this is very important)