Merge "resolve job view issue"