Merge branch 'feedback-fixes' into 'Milestone-3'

Implemented fixes recommended by Team3

See merge request !48