Changes done for FC-1899 and FC-1904