development joeyarora-development-patch-36497 master update