Merge "Add configs for router activity and allowlist" into main