CURRIKI-6240, CURRIKI-6242

Solutions for both