additional update to feature2 file from feature-2 branch
resolved ft2 and ft3 branch conflict