Merge branch 'bug2408-v2-021-common' into bug2408-v2-022