[C] Changed hard-coded parameters.
Merge branch 'trunk' into releases