[OPTIQ-312] Trim non-required fields before WindowRel