Update from upstream - opensuse team

update from opensuse team and susebjqateam