Merge branch 'tuncer-gitlab-separate-dialyze'