Updated reference opening code to support return to the section that originated the call.
Merge origin/master