testingSVN - solved merge with GH94 conflicts