Merge "Switch from Felix to config-driven dependencies"