TRINIDAD-848 - merge the changes to trunk;
14 files changed