misc before reintegration to master