completed DEVELOPER-141

Small changes here