Merging changes up to 2.0.4