Merge "Always return success when set the opportunistic sub to default" into main