Merge "Create /data/per_boot"