PyroFire232 1.3.6 prerelease merge