Added second public hotfix for Clearwater

Added second public hotfix for Clearwater