fixed CVAC_DataDir for case it turns out to be None or empty
fixed a warning message
Merge commit '657ec8e9f05f0f8794d4b93965a4a328e3eaae36' into devel
automatically updated version patch number