Change to named AMD define
Merge branch 'release/1.7.4.ja.1'