Merge branch 'atop' into ricardo