Merge "Add IN_DEFAULT_DIRECTORY to contract"