Allow to always drop pq branch after export

Closes: #761160