Merge changes from topic 'feature/rebase-3'