merged lua pwd changes