package update
DRY, package patch
resolve merge conflict with develop