Merge remote-tracking branch 'upstream/devel' into exit_json