fix apps to enable more than 1 bookmark labels
Merge remote-tracking branch 'origin/develop' into develop