[JBWS-3779] WIP