4.2.1. Closes #330, Closes #329