[comskip/f40] Update to commit 109b5d1