For master see also SNOWDROP-67