master merge openrc correction