master: prepared for production stability