Location template
merge dev