Moving the non-blocker BZs out of ODF-4.17.0. If this is a blocker BZ, please update the flag appropriately and propose it back to ODF-4.17.0 with justification note.