[PR] Additional improvements for production and development