Merge "Fix device effect instatiation" into main