Merging the gallery ads branch.