Merge "(refs #7771) Fixed invalid inline"