Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev