Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev