Merged 1.4.27 and 1.5 beta