[FIX] Non-ranch invoice merge

Merged Hermes requested to merge 12.0-migration into 12.0

Merge request reports