Testing...debug calls
Merged with local copy
Preliminary Fix for bug 924609

Need to check for edge cases and refactor code out of video app and into shared library instead of just copying the code