G.Delautier 19/09/2017 : bug with CLOUD_ONLY