Merge commit 'remotes/mkszuba/rpm'