* commit 'd6523da1ad7bae805a3dbea8d7b398d86cd3c181': Merge latest prototype changes into the framework