Fix (Bug#32218). Do not merge with master