Catchup on Tolstyak development-custom branch
Move scene exceptions