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