CDB-804 #resolves Add warning message + fixes specs