[#395] Applied proposed changes