DEV-2 special next commit