Merge branch 'mock-data' into thin-client