Fix for issue 1338 & #1296, should allow for future between rules on nested properties See merge request !5862