merged latest version v1.2.1 8af308b6e19e907f8501bf308e62a652d12f551c