Backport previous changes from lest to lest_cpp03.hpp
v1.11.0 Update Changes