Merge branch 'ar/unconfuse-three-dots'