Release 152 bugid 98698 kamilkoterba

Adding features from last week with errors corrected