Merge remote-tracking branch 'origin/zeke/fix/configurable-module-id' into zeke/fix/configurable-module-id Merge in origin branch