Added propper memory check for updates.
Merge branch 'test' into dev