Complete #638 implementation
Added release notes wrt #631