Mesh 2235/change-internal-functions-return-type (#1743)

Mesh 2235/change-internal-functions-return-type (#1743) #802