development bug-fix joeyarora-development-patch-36497 master