Align with OPENDJ-897