backport of monday changes