DELTASPIKE-405 revert back to <M>
DELTASPIKE-60 minor JavaDoc tweaks