Merge "Fix the top-right reference block location" into nextgenv2