Ready for merge (disable unavailable comment app)