[INCOMPLETE COMMIT]
fixed memory issues.
fixed memory issues.
Merge branch 'valid-infra'