Merge "Remove the weak pointer in the header files" into devel/master