[[ LC 7.0.1-GM ]] Post-merge fixes