bugid-68905 and bugid-69199 fixing issues with lightbox and url updating
Merge branch 'bugid-68905' into dev