Staged for 1.1.3 release