BATCH-2003: Partially fixed property injection