Update fork from dev

Update fork from dev to commit 38fbce861afbcc35a7f7a6ea4b271fc37f17b400