Merge branch background into dev