ODE-1021: Rampart Basic Sample08 fixed by RAMPART-376 and Sample09 fixed by RAMPART-377