Merge "Cleaning up temporary interfaces which were created for refactoring" into main