A part of https://github.com/mage2pro/core/issues/368 https://github.com/mage2pro/core/issues/168#user-content-nullable Similar to https://github.com/mage2pro/core/issues/369
