Comitting Ernesto CASL patch 3