Merge "Fix build lib" into devel_3.0_main