Merge branch '2163_rotating_dash'