Fix 1480, 1483, 1497 $this instead of $object
Fix 1490 $this instead of $object
Fix 1462, 1468 $this instead of $object
Merge pull request #1665 from atm-maxime/develop

Fix 1480, 1483, 1497 $this instead of $object