MVP-5 Update for 1.5.1