Merge branch 'fix-2188' into medal-v1