PR: 12114 Submitted by: maintainer
PR: 10745 Submitted by: Martti Kuparinen <martti.kuparinen@ericsson.com>