Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into...