Changed to check the length of all unfiltered properties instead of only filtered properties. Added additional check if descriptor is a dynamic property. Signed-off-by: Matthew Burgess <mattyb149@apache.org> This closes #4707