Modification to  issues SAT-251, SAT-268, SAT-269, SAT-270, SAT-271