ENG-6857: refactore more...