#78: Luka's May 5 changes

Change request updated 1 year ago