merge from merge from S.D.O.C. LTD repositories