merge branch 'mini', add standalone support