#16772395038316: Fixes
#16772395038316: Merged fixes