Follow up - TRUNK-4491