syncing with LDP4j changes