CLOUDIFY-1791 Fixed more mege issues