TRUNK-4274 aadded @param encounter
TRUNK-4274 removed the changeset that is to be handled by TRUNK-4283