This MR addresses issues #74 (closed) and #75 (closed).
enabled an automatic merge when the pipeline for 5e7f1ce6 succeeds
mentioned in commit a3919b4d
merged