Revert "Removing unwanted block parameters"
Revert "Removing unwanted block parameters"

This reverts commit cf23b958c873281a03a32228c93e4d0ddf9c0de6.

sriprasanna/RapidFTR,sriprasanna/RapidFTR,sriprasanna/RapidFTR,sriprasanna/RapidFTR