Reorder promotion config
Merge pull request #1590 from umpirsky/fix/finite-cleanup

Finite cleanup