84436a245c
Merge commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1' * commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1': layout lib tests cleanup