CR-04 & CR-05

Devs-by-devs compatible with both options(owners only or all devs that
had commented)
Bugs-by-devs compatible with both options(owners only or all devs that
had commented)