Co-authored-by: Vigers Ray <vigersray@gmail.com> (cherry picked from commit fc92be97fa) (cherry picked from commit 797d08fbed63cf90ed52410c3fbcab8f62e1cf17) (cherry picked from commit c18c290f824968427c501aef8fcc6ed8e720ffb1)
fc92be97fa