- add test coverage for rhbz#1650363 - cherry-picked from 5322664432 Related: rhbz#1785159
5322664432
Related: rhbz#1733504
Related: rhbz#1698366