Fix items from mozilla review. Closes #4374.
Merge remote-tracking branch 'andrejb/bug/4374_fix-items-from-review' into develop