Merge branch 'tz/maint-rpm' into maint