Updated to only search correct directories when depth is greater than 2.
Merge branch 'sandbox' into int
Merge branch 'uat'