Updated to latest console version from master