Issue resoled after merging development