- Potential userProperties Fix (#6740) (#6784)