[Finishes #69810630, #69409422,# 69409436]