fix for BUGHUNTS4WEBBASEDARENA-33, BUGHUNTS4WEBBASEDARENA-24 and BUGHUNTS4WEBBASEDARENA-31