Merge last ITER changes

resolves #448 - RAP build fail
resolves #385 - Time Format yyyy/MM/dd hh:mm:ss.SSS