Tickets CST-54, CST-43

fixed by Maja, merged and tested by me