feature/simplify
mcasopt
#18200198