Merging changes from iserc_final