Merge commit '54e025fbc43420fae17d7bb56407fab74c4945b7' * commit '54e025fbc43420fae17d7bb56407fab74c4945b7': Fix issues 2333450 and 2333559: