Merge remote-tracking branch 'origin/bug_fix/scroll_view' into bug_fix/scroll_view_and_label_tags