Added non-persistant merging to main view and job with details.
Merge remote-tracking branch 'origin/master'