Started to add connection locking (needs refactoring, rushed)
Merge remote-tracking branch 'origin/master' into feature-conn-locking
Merge branch 'master' into feature-conn-locking
Rogue commit
Merge remote-tracking branch 'origin/master' into feature-conn-locking
Added bulk ManyToOne
Replaced null parameter with IS NULL
Merge branch 'master' into feature-conn-locking