Merge remote-tracking branch 'origin/milestone-logbook-search-settings' into issue_498-cosmetic_changes