Progress on #559
Fixed #559
#559 up to cr1
Fixed #559