reworking
Merge commit 'origin/double_vertex'
Merge commit 'origin/master'