packaging updates; Apache 2.0