Merge "Add release note and fix some TODO from system scope support"