LPS-48821 BeanPropertiesUtil improvement