Merge "Fix bug 5167786 - make sure custom option panels still work."