Merge branch 'refs/heads/fix_ticket29850'