Merge development changes (0.9.4)