Update AR and AS to 4.0.4
Merge pull request #1525 from arthurnn/update_ar

Update AR and AS to 4.0.4