Merge branch 'dev' into bugid-69199-lightbox-url-params
bugid:69199 fixing issues with query string in lightbox
Merge branch 'bugid-69199-lightbox-url-params' into dev