[fedora-atomic] PR #98: f27 backports from master