[Core] Fix promotion bug that was introduced by wrong merge + fix specs
Merge pull request #1933 from stloyd/bugfix/promotion_bug

[Core] Fix promotion bug that was introduced by wrong merge + fix specs