ARQ-1658 Wrong isInstance check prevents usage of custom container
Merge remote-tracking branch 'upstream/master'