dev-aarch64 #263

Closed
duke wants to merge 4 commits from dev-aarch64 into dev