Merged in my changes from REL1_4