Workaround for I-06615 as reported by Private Cloud Support Team