Resolves: RHBZ#1913001, RHBZ#1912953 Resolves: RHBZ#1912636, RHBZ#1898602, RHBZ#1898768, RHBZ#1893987, RHBZ#1893184