Addresses: https://github.com/YCloudYUSA/yusaopeny/pull/8 Fixes: https://yusa.atlassian.net/browse/DS-64