To be ported from HSG-Guides: * https://gitlab.com/HistoryAtState/guides/merge_requests/20/commits * https://gitlab.com/HistoryAtState/guides/merge_requests/22/commits * Related issue https://gitlab.com/HistoryAtState/guides/issues/50 including mentioned commits