Merge branch 'topic/reorder'