merge-update of trunk and disabling GUI-Control separation