Merge with ci 2.1 stable