Merged from nob.. fork