Revert "VOSA-153:Reverting commit d81ce2c859dfbbfcd19fb92db2affce6a8445824"

This reverts commit d81ce2c859dfbbfcd19fb92db2affce6a8445824.