Merge branch 'fix-3108' of https