Commit Main & Lite Scope (130507 GMT+7)