MPS-19819 Exceptions during mbeddr build: method annotated with @NotNull can't return null. Propagate original exception to figure out root cause.
Merge branch 'MPS3.1'