Apply fix for non-determinism in BPC app from dev branch