Merge "Unify file name as *-wrap.cpp for the wrapping code" into devel/master