Merge branch 'retina-position'