Merge "Use output/error maintenance functions"