F21 Self Contained Change: Improved Ivy Packaging