Merge "Chaning some methods to return result directly instead of posting it on a callback"