Branch merge

Merged enhancement/back-buffer branch into master