Build #224:   Merge branch 'dev' into iss35_A on branch iss35_A almost 7 years ago