Implement changes in orchestral/memory@69034bb

Signed-off-by: crynobone <crynobone@gmail.com>