Merge branch 'case-3387' into develop