CORE-1225

This is an implementation of CORE-1225. Please pull.