Merge "console: update skeleton" into integration