Restore OMF-5 backward compatibility#11

shtrom wants to merge 2 commits into

mytestbed:mastermytestbed/omf:masterfrom

shtrom:issue1804-omf-5.4-compshtrom/omf:issue1804-omf-5.4-compCopy head branch name to clipboard