use custom operator_id populator for Location creation
Merge branch 'enhancements'