Nick007J Merge branch 'miami' into lcs