Reflect change of datag/pkgbox@6905797 and use $O for option