Considering done as part of the merging script ( HSEARCH-3179 Open ).
Added follow-up tickets for additional work.