BVS-432 - Making configuration persistent across reboots