Continuation of #487
Continuation of #487