Merge "update_current.py changes for extracting intermediate MDC" into pi-dev