Merge "Check NULL pointer dereference of the return value" into devel/master