Merge branch 'move_to_shared'