Starting 2.2.1 hotfix branch
Custom template for gallery was not correctly set (#1321)