Branch 0.4 select target section

Tested and verified and updated on branch 0.4,
Merge branch 'abdullah_0.4' into umair
missed images