Changes related to #572