Update bom to v13 and apply TEIIDRHQ-25