Reflecting changes from OmnisCore.