Merge remote-tracking branch 'origin/dev-3.x' into feature/multimodal-architecture-adapters

Author: jlarson4