Closes #6083, closes #6086, closes #6379 (#6392)
Closes #6083, closes #6086, closes #6379 (#6392)


dom96/Nim,russpowers/Nim,tulayang/Nim,dom96/Nim,russpowers/Nim,dom96/Nim,tulayang/Nim,dom96/Nim,tulayang/Nim,tulayang/Nim,russpowers/Nim,russpowers/Nim,russpowers/Nim,russpowers/Nim,russpowers/Nim,tulayang/Nim,dom96/Nim,dom96/Nim,tulayang/Nim,dom96/Nim