Merge for retab
Retab changes for PR #1373