Merge branch 'meeting/LI69' into maintenance/json_testing