GUI-957
more changes to be re-done