The implementation looks ok to me since it is convenient for now to keep changes to the regular cmd export functions low.
The force-pushed appeared because of reverting some merge commit and then changing the commit message.
I think this is ok for a merge.