Merge upstream

Merged upstream changes.

[Ticket: X]

Signed-off-by: Bart Kerkvliet <bkerkvliet@gmail.com>