Merge for-stable fixes branch into for-next development branch.
Signed-off-by: NSebastian Reichel <sebastian.reichel@collabora.co.uk>