Tentative 1.5.1 update (to be reverted if needed)