Merge "Restore first ref frame pointer to the correct value"