add changes from beta3 branch - arguendo updates