Cherry-pick of 6f4ba00f, related to #121 (closed)
Pipeline #11645 passed
Pipeline passed for fdcf06f6 on JohannesPfeifer:output_third 1 month ago
Pipeline #11651 passed
Pipeline passed for 9b7107f1 on 6.x 4 weeks ago