Merge "Fix resource package install issue." into devel/master