ref #4123 - adapt changes after story-time meeting