Apply patch to fix 7181
Merge branch 'fix7181' into develop