Merge from Aisel package