Merge "Fix for: error: 'when' expression must be exhaustive, add necessary 'null' branch or 'else' branch instead"