CU-131 Added comments using the Lightbox
CU-176 Pin options not found !
Merge remote-tracking branch 'origin/develop' into develop