Merge branch '2067_ruler'