Fix for: GF-54911 & GF-55494