Merged 1.4.8 with 1.4.7