CHeck for null pointer in equals to handle situation when a proeprty is
not resolved.
Merge remote-tracking branch 'origin/develop' into develop