Merge pull request #16678 from poettering/loop-configure