Last changes.
Merge remote-tracking branch 'origin/J' into Zargy