[resolved issues SAT-274, SAT-282, SAT-296, SAT-297, SAT-298]