squashed WS-689 and WS-690
squashed WS-689 and WS-690

shridharsahil/libraryweb-site,shridharsahil/libraryweb-site,shridharsahil/libraryweb-site,shridharsahil/libraryweb-site,shridharsahil/libraryweb-site