Feature/test 0.9.169 pre5