Complete sync with the Ref. repo