This will trigger users to disconnect. Prefer to apply after hours
mentioned in commit bf70fc56
merged