Merge fix on computeCreateView
Merge fix on computeCreateView
corrections for grunt reported issues