BACKLOG-1107 Binding type was overwritten with EB default binding which resulted in duplicate location/binding types
Merge branch 'feature/BACKLOG-1107' into develop