more changes from main zerocloud tree