Merge branch 'features/JAL-1648_cache_user_inputs' into develop