Merge "Make it possible to not propagate errors to PHP"