Import DP lightbox changes from templates repo
Merge branch 'dev-dp-lightbox' into dev-new-lightbox