[SQUASH ME] addressed changes like in #1938