merge with master, pay attention to new vaccum configuration which may be not ready for naj 2022 startup