Issue #112: Improvement to AmbiguousStep error (Change request)
Description tweaks: Provide resolved status.
Merge branch 'develop'