Merge "Fix a bug from merging frame parallel branch into master."