You should be able to update directly. I've gone from various 1.x versions to various 2.x versions without issue,
Note that since you're on 1.0.4.0, you'll be prompted to perform an additional update after you do the firmware update. After you install the firmware and reboot, log back in and you'll see a popup dialog asking you to install the system update. Just install it and reboot again.
------------------------------
BMS
------------------------------