Merge "Enable -Wnon-virtual-dtor to avoid incorrect C++ code sneaking in" into devel...