MODIFIED: fixed some temporary changes due to jenkins issue