update velvet optimiser version
merge cf changes
merge ae
merge ae via cf
commit merge