CW-255 removed changes from another branch