Merge ecms/regression to stable/3.5.x