[#70407418 ] [#70407384]

Made changes according to the corrections.
Not merging with the master as there are some errors.
#70407418 - datacollection controller
#70407384 - test cases for the datacollection controller