Merge remote-tracking branch 'origin/devcp'

# Conflicts:
#	error_log
