Merge "Change default session tag to 'APP' from 'OTHER'" into main