Merge branch 'make-gather-facts-explicit' into 'master'

[ci skip] Make fact gathering explicit.

See merge request !2