Hand migrate c27c8d0 from master (fixes named set values)