sync with redhat/astapor-master