Merge latest CRA-505 to master. Fixed most of the grammar issues with XmlModelFile. Added parseCurrentValue.