Merged more updates from jlemsdev