bring master in line with e47_aj9 branch
11 files changed