( merged the 0.8.3.4 changes back in 0.8.3.2)