Refined extended device YML definitions
Merge commit '67e8be6'
Reverted change of deployed_site type