Fixed couple of performance issues.
updated dev release branch