Merge branch 'fix21936' into fixes
Merge branch 'fix21937' into fixes