Fix merge because of ldpi-common