Merge branch 'bugfix/partialOveralpGGI'