Fix for Jobs/mine regressing

Change-Id: I92c81af1b030e8a65f04bfb46bd8dc6ccbb0de45
Merge "Fix for Jobs/mine regressing" into develop