Sync with master, merge all changes from master to RC0.7.4_master