bug-1562 #23

Open
bmc wants to merge 2 commits from bug-1562 into main