merge prepare_0_5_94.
13 files changed