Update gallery for sdk compat

This branch includes build changes