initial port for 10.0 with some fixes in update.sh