pull #473-T7-028 by Phildar Design Team