Merge with 374.134 (ac56) - part 1