manually merged ibel's changes to stable