merge the changes on the branch prepare_0_5_96 to the main trunk.
17 files changed