ref: https://lawiq1.atlassian.net/browse/LAWDATA-1501
Testing this commit