Merge "Fix some problems with ASECs" into jb-dev