lots of changes to support my debugging other MediaCloud related apps