Merge "[417874] react to default folder changes"