Commiting changes to
support:https://lawiq1.atlassian.net/browse/LAWDATA-1499