Add optional namespace to prerequisite count mismatch.
Merge branch '1.5'
Little test tweaking