Merge "Simplified doEditContent exception handling"