Use boolean rather than bitwise logic in a conditional
Make containers unloadable again
Merge remote-tracking branches 'dda/pr/1077' and 'dda/pr/1078' into dda-master