bug/204/state-manager-layer-check



<!---
@huboard:{"order":204.5,"milestone_order":207,"custom_state":""}
-->