Implement MPL-404 by Amir