Commit support. Refs EMP-89