Merge asec changes.