Merge changes from riking