Pull #453-T6-113 and 121 by Phildar Design Team