Merge "fixing issues in configuration package"