Merge "(bug 46787) API: Fix rccontinue handling"