Port of 31335-job-dropdown to EE

Closed Filipa Lacerda requested to merge ee-31335-job-dropdown into master