Merge branch 'mpw-4' of https://github.com/sajjadahmed677/Azadi_II into mpw-3
The design is extended version of azadi submitted in MPW-2