Merge "Controller Blueprints fails to lookup directory"