Cross merging new stuff on LEX branch to release-0.11

@bcipolli here you are