Bug fixes: address PR 3126 follow-ups (#3164). Refactor: fix circular dependencies (#3204). CI: fix merge conflict. Docker image details provided.