Some updates on #692