Merge branch 'daniel/cherry-pick'