Merge branch 'ak/gitview'