Merge branch 'bug_487_service_selection_event_text_color'