Initial commit
Workaround for next-gen gallery