Merge "Title: Fix subpage move error reporting"