[NFR] Pull request for interface checking

Fix issues similar to #741

**Please review carefully!**