Merge aFarkas latest changes.