Merge "Check NULL return value in builder-impl.cpp" into devel/master