Re #7855 Fix issue with int property
Re #7855 Fix issue with int property (fix conflict)