Followups of !277

The following discussion from !277 (merged) should be addressed:

Edited by Kevin Heinicke