Fix Calculated Look up Issue.
Merge branch 'dev'