Pull #485-T7-448 by Phildar Design Team