#11837 responsive adjustments