Merge changes from topic 'oom-dcae-pnda'