Merged jactive fixes from cm-10.1