Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching...