Merging master back to gallery codebase