Merge "Refactor package-export script for reuse"