[General] Added hasOwnProperty checks
[General] Removed obsolete code
Merge remote-tracking branch 'origin/dev' into dev