GA 5.0.4.0 merge

GA 5.0.4.0 on 2013-02-14