Merge CE BenchBudEE commit 00937c39d96b9ebb1b0292c11cc231788ab24edd