Merge "Fix releaseBufferCallback null pointer dereference" into sc-dev