Update for 1.5.1 done. Now in sync with 1.4.7 changes.