Converted Arrays.asList(..) return to ArrayList so that list modification operations are allowed
Merge branch 'branch_release_20140410'