Merge "Add monitor dir to unit test" into stable/fraser