Big commit, enabling event merging, object merging and doing a few things to reduce executable size