Merge commit '9479a516cffd990ed3dfc209c5e768f4fb447812' * commit '9479a516cffd990ed3dfc209c5e768f4fb447812': Fix bug (#1947162)
Merge commit '9479a516cffd990ed3dfc209c5e768f4fb447812' * commit '9479a516cffd990ed3dfc209c5e768f4fb447812': Fix bug (#1947162)