TAP5-2296: Update dependencies and remove cross-module dependency conflicts