Feature branch

Fix duplicate commit issue.