RA: o2cb: Improve configuration stability.
--HG-- extra : convert_revision : 94d9a8c98f929affbd5a82bfbed188bb63fe71c6