Catchup on Tolstyak development-custom branch