Rebase and merge again from S.D.O.C. Ltd repositories