Merged changes from the modulerr and combinerr in the demo application to the main files