Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.4-lts

Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.4-lts #636