Committing Ernesto CASL patch 6