Testing of merge

Testing of merge from Master - fixes