Merged v1.4.8.0 and removed unused methods.