Committing Ernesto CASL patch 7