Move the images to their own sub directory while create/reconfig action
Merge branch 'master_5153' into branch_v3_2