Merge v4-1-35 into v4-rivoreo-fork