rename, NO_GET_CONTEXT
work on 5.18.0
cleanup
make it work on 5.18.0
Checking in changes prior to tagging of version 2.04.

Changelog diff is: