Merge "Fixed resource package install error" into devel/master