Fixed # Checking actual value ...

Checking actual value of the entity's primary key attribute.
Revert "Fixed # Checking actual value ..."

This reverts commit 192387cff3fadaa6d4d00e709ad21e3187d057f7.
Revert "Revert "Fixed # Checking actual value ...""

This reverts commit 7cf4c5958425b2916ba0dbf8adc721b15b72da43.