Minor update as dev will be focusing on demos and examples.
Note: postponed to focus on more current fixes and improvements.