[comskip/f36] Update to git snapshot