Merged with Gitlab master branch