Merge branch 'lane/gemma4-tools'