Signed-off-by: Ganesh <gvenkatr@ee.oulu.fi>
Revert "Signed-off-by: Ganesh <gvenkatr@ee.oulu.fi>"

This reverts commit 8580cea16fb6b4207ab6656450bb8ef4c6d820bf.
Merge remote-tracking branch 'origin/jsfra_base_v1.0' into jsfra_base_v1.0