I think this ticket can be closed in the light of commits 74102a88afc9d8f1973892ce66cf9a83e79d043a and 6f669bf58bbfaf8d7ef367574be9252df84c08d1?