Merge branches 'bugzilla-15807', 'bugzilla-15979-v2' and 'bugzilla-19162' into release