CXX-280 allow for rc versions
CXX-279 return value from all control paths