Merge "Make COMMON/MUSIC compatible with Kubernetes v1.17"