Merge "Move effect controller injection (2/3)" into main