Merge commit '54dc5807fe74b1d94e9c9ef52dd6929200aa0b80' * commit '54dc5807fe74b1d94e9c9ef52dd6929200aa0b80': enable mdp debugging on error, also check for invalid inputs