Merge remote branch 'remotes/origin/master' into juno-refactoring Conflicts: agent/tcf/main/main.c agent/tcf/main/main_client.c