Merge commit 'brent/register_phys_mem'