Merges branch 'dynamic-injection'