merged recent changes from aw dev and ci branches